mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 22:57:39 +01:00
[MIRROR] Fixing client eye (#11812)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Will
Cameron Lennox
parent
b9db7ed21f
commit
7d57273375
@@ -451,10 +451,7 @@
|
||||
|
||||
// check if mob has client, if so restore client view on eject
|
||||
/mob/pipe_eject(var/direction)
|
||||
if (client)
|
||||
client.perspective = MOB_PERSPECTIVE
|
||||
client.eye = src
|
||||
return
|
||||
reset_perspective()
|
||||
|
||||
/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction)
|
||||
var/list/dirs
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
var/destinationTag = "" // changes if contains a delivery container
|
||||
var/hasmob = FALSE //If it contains a mob
|
||||
var/partialTag = "" //set by a partial tagger the first time round, then put in destinationTag if it goes through again.
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
dir = 0
|
||||
|
||||
// initialize a holder from the contents of a disposal unit
|
||||
@@ -22,9 +23,6 @@
|
||||
for(var/mob/living/M in flush_list)
|
||||
if(M.stat != DEAD && !istype(M,/mob/living/silicon/robot/drone))
|
||||
hasmob = TRUE
|
||||
if(M.client)
|
||||
M.client.perspective = EYE_PERSPECTIVE
|
||||
M.client.eye = src
|
||||
|
||||
//Checks 1 contents level deep. This means that players can be sent through disposals...
|
||||
//...but it should require a second person to open the package. (i.e. person inside a wrapped locker)
|
||||
@@ -102,10 +100,6 @@
|
||||
/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other)
|
||||
for(var/atom/movable/AM in other)
|
||||
AM.forceMove(src) // move everything in other holder to this one
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
if(M.client) // if a client mob, update eye to follow this holder
|
||||
M.client.eye = src
|
||||
qdel(other)
|
||||
|
||||
/obj/structure/disposalholder/proc/settag(new_tag)
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
active_power_usage = 2200 //the pneumatic pump power. 3 HP ~ 2200W
|
||||
idle_power_usage = 100
|
||||
var/stat_tracking = TRUE
|
||||
flags = REMOTEVIEW_ON_ENTER
|
||||
|
||||
// create a new disposal
|
||||
// find the attached trunk (if present) and init gas resvr.
|
||||
@@ -120,9 +121,6 @@
|
||||
for (var/mob/V in viewers(user))
|
||||
V.show_message("[user] starts putting [GM.name] into the disposal.", 3)
|
||||
if(do_after(user, 2 SECONDS, target = src))
|
||||
if (GM.client)
|
||||
GM.client.perspective = EYE_PERSPECTIVE
|
||||
GM.client.eye = src
|
||||
GM.forceMove(src)
|
||||
for (var/mob/C in viewers(src))
|
||||
C.show_message(span_red("[GM.name] has been placed in the [src] by [user]."), 3)
|
||||
@@ -187,9 +185,6 @@
|
||||
add_attack_logs(user,target,"Disposals dunked")
|
||||
else
|
||||
return
|
||||
if (target.client)
|
||||
target.client.perspective = EYE_PERSPECTIVE
|
||||
target.client.eye = src
|
||||
|
||||
target.forceMove(src)
|
||||
|
||||
@@ -211,9 +206,6 @@
|
||||
|
||||
// leave the disposal
|
||||
/obj/machinery/disposal/proc/go_out(mob/user)
|
||||
if (user.client)
|
||||
user.client.eye = user.client.mob
|
||||
user.client.perspective = MOB_PERSPECTIVE
|
||||
user.forceMove(get_turf(src))
|
||||
update()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user