cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

forceMove thing.

Browse Source
This commit is contained in:
eswordthecat
2015-11-11 07:00:36 +08:00
parent 3e05bf175d
commit 17342a2d8e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/OpTable.dm
View File

@@ -109,9 +109,7 @@
/obj/machinery/optable/proc/check_victim()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/machinery/optable/proc/check_victim() called tick#: [world.time]")
if (victim)
var/mob/living/carbon/human/H = locate() in src
if (victim == H)
if (victim.loc == src.loc)
if (victim.lying)
if (victim.pulse)
icon_state = "table2-active"
@@ -135,7 +133,7 @@
user << "<span class='bnotice'>The table is already occupied!</span>"
C.unlock_from()
C.loc = src.loc
C.forceMove(loc)
if (C.client)
C.client.perspective = EYE_PERSPECTIVE