cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixing client eye (#11812)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-12 19:44:25 -07:00
committed by GitHub
parent b9db7ed21f
commit 7d57273375
95 changed files with 762 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/crates_lockers/__closets.dm
View File

@@ -128,9 +128,6 @@
for(var/mob/M in src)
M.forceMove(loc)
if(M.client)
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
/obj/structure/closet/proc/open()
if(opened)
@@ -201,9 +198,6 @@
continue
if(stored_units + added_units + M.mob_size > storage_capacity)
break
if(M.client)
M.client.perspective = EYE_PERSPECTIVE
M.client.eye = src
M.forceMove(src)
added_units += M.mob_size
return added_units

14
code/game/objects/structures/crates_lockers/closets/statue.dm
View File

@@ -7,6 +7,7 @@
anchored = TRUE
health = 0 //destroying the statue kills the mob within
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
closet_appearance = null
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils.
var/intialBrute = 0
@@ -19,10 +20,7 @@
if(L.buckled)
L.buckled = 0
L.anchored = FALSE
if(L.client)
L.client.perspective = EYE_PERSPECTIVE
L.client.eye = src
L.loc = src
L.forceMove(src)
L.sdisabilities |= MUTE
health = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
intialTox = L.getToxLoss()
@@ -61,15 +59,13 @@
/obj/structure/closet/statue/dump_contents()
for(var/obj/O in src)
O.loc = src.loc
O.forceMove(get_turf(src))
for(var/mob/living/M in src)
M.loc = src.loc
M.forceMove(loc) // Might be in a belly
M.sdisabilities &= ~MUTE
M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
if(M.client)
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
M.reset_perspective() // Fixes a blackscreen flicker
/obj/structure/closet/statue/open()
return

2
code/game/objects/structures/watercloset_vr.dm
View File

@@ -62,7 +62,7 @@
/obj/structure/toilet/attack_ai(mob/user as mob)
if(isrobot(user))
if(user.client && user.client.eye == user)
if(user.client && !user.is_remote_viewing())
return attack_hand(user)
else
return attack_hand(user)