From 58afd403a98e7376305dce753d44b8e8a0b70518 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Sat, 28 Dec 2013 08:58:12 -0500 Subject: [PATCH] Moving some defines over to setup --- code/game/machinery/telecomms/machine_interactions.dm | 4 ---- code/setup.dm | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index da2af57a566..65c5bd0a9fc 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -7,8 +7,6 @@ */ -#define STATION_Z 1 -#define TELECOMM_Z 3 /obj/machinery/telecomms var/temp = "" // output message @@ -389,5 +387,3 @@ return 1 return 0 -#undef TELECOMM_Z -#undef STATION_Z diff --git a/code/setup.dm b/code/setup.dm index 307bc433fa6..89f503e554f 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -791,4 +791,10 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define VAMP_JAUNT 10 #define VAMP_SLAVE 11 #define VAMP_BLINK 12 -#define VAMP_FULL 13 \ No newline at end of file +#define VAMP_FULL 13 + +// Moved from machine_interactions.dm +#define STATION_Z 1 +#define CENTCOMM_Z 2 +#define TELECOMM_Z 3 +#define ASTEROID_Z 5