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

Fix for table/computer cross-detection.

Browse Source
This commit is contained in:
Segrain
2013-07-30 19:13:42 +03:00
parent 578a020c8b
commit 24bc26fd13
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
for(dir in list(NORTH,EAST,SOUTH,WEST)) for(dir in list(NORTH,EAST,SOUTH,WEST))
computer = locate(/obj/machinery/computer/operating, get_step(src, dir)) computer = locate(/obj/machinery/computer/operating, get_step(src, dir))
if (computer) if (computer)
computer.table = src
break break
// spawn(100) //Wont the MC just call this process() before and at the 10 second mark anyway? // spawn(100) //Wont the MC just call this process() before and at the 10 second mark anyway?
// process() // process()

3
code/game/machinery/computer/Operating.dm
View File

@@ -13,7 +13,8 @@
..() ..()
for(dir in list(NORTH,EAST,SOUTH,WEST)) for(dir in list(NORTH,EAST,SOUTH,WEST))
table = locate(/obj/machinery/optable, get_step(src, dir)) table = locate(/obj/machinery/optable, get_step(src, dir))
if (!isnull(table)) if (table)
table.computer = src
break break
/obj/machinery/computer/operating/attack_ai(mob/user) /obj/machinery/computer/operating/attack_ai(mob/user)