probably fixed merge conflict, also updated Antiqua.dmm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
caelaislinn
2012-05-21 17:44:01 +10:00
parent aa67c605dc
commit 98c0cfeb22
7 changed files with 54 additions and 60 deletions
-1
View File
@@ -1,5 +1,4 @@
/mob/aiEye
var/list/visibleCameraChunks = list()
var/mob/ai = null
@@ -1,4 +1,3 @@
//------------------------------------------------------------
//
// The Cameranet
@@ -1,4 +1,3 @@
#define MINIMAP_UPDATE_DELAY 1200
/datum/camerachunk
@@ -1,4 +1,3 @@
/client/var/minimap_view_z = 1
/obj/minimap_obj
@@ -1,5 +1,4 @@
/turf
var/image/obscured
var/image/dim