From 569cd2f0dfab163302ec17d1e8af93e3c4754e85 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Thu, 21 Jun 2012 14:11:55 -0700
Subject: [PATCH] Damned constants.  Also: Moved more stuff into #defines.

---
 code/defines/global.dm      | 17 ++---------------
 code/game/communications.dm | 15 ---------------
 code/setup.dm               | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/code/defines/global.dm b/code/defines/global.dm
index be2c232e8fa..f5d4266cddb 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -179,23 +179,10 @@ var/list/AAlarmIndexToFlag
 var/list/AAlarmIndexToWireColor
 var/list/AAlarmWireColorToIndex
 
-var/const/SPEED_OF_LIGHT = 3e8 //not exact but hey!
-var/const/SPEED_OF_LIGHT_SQ = 9e+16
-var/const/FIRE_DAMAGE_MODIFIER = 0.0215 //Higher values result in more external fire damage to the skin (default 0.0215)
-var/const/AIR_DAMAGE_MODIFIER = 2.025 //More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
-var/const/INFINITY = 1e31 //closer then enough
-
-	//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
-var/const/MAX_MESSAGE_LEN = 1024
-var/const/MAX_PAPER_MESSAGE_LEN = 3072
-var/const/MAX_BOOK_MESSAGE_LEN = 9216
-
-var/const/MAX_NAME_LEN = 32
-
 var/list/paper_blacklist = list("script","frame","iframe","input","button","a","embed","object")
 
-var/const/shuttle_time_in_station = 1800 // 3 minutes in the station
-var/const/shuttle_time_to_arrive = 6000 // 10 minutes to arrive
+#define shuttle_time_in_station 1800 // 3 minutes in the station
+#define shuttle_time_to_arrive 6000 // 10 minutes to arrive
 
 
 
diff --git a/code/game/communications.dm b/code/game/communications.dm
index b5449e60d6e..012fe5419ec 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -119,21 +119,6 @@ var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213
 var/NUKE_FREQ = 1200 //Randomised on nuke rounds.
 
-#define TRANSMISSION_WIRE	0
-#define TRANSMISSION_RADIO	1
-
-/* filters */
-var/const/RADIO_TO_AIRALARM = "1"
-var/const/RADIO_FROM_AIRALARM = "2"
-var/const/RADIO_CHAT = "3"
-var/const/RADIO_ATMOSIA = "4"
-var/const/RADIO_NAVBEACONS = "5"
-var/const/RADIO_AIRLOCK = "6"
-var/const/RADIO_SECBOT = "7"
-var/const/RADIO_MULEBOT = "8"
-var/const/RADIO_MAGNETS = "9"
-var/const/RADIO_POWER = "10"
-
 var/global/datum/controller/radio/radio_controller
 
 datum/controller/radio
diff --git a/code/setup.dm b/code/setup.dm
index 0964045e12e..0afd4f21e29 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -1,5 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
+#define TRUE 1
+#define FALSE 0
+
 #define PI 3.1415
 
 #define R_IDEAL_GAS_EQUATION	8.31 //kPa*L/(K*mol)
@@ -422,3 +425,38 @@ var/list/liftable_structures = list(\
 	/obj/structure/filingcabinet, \
 	/obj/structure/reagent_dispensers, \
 	/obj/machinery/portable_atmospherics/canister)
+
+//////////////////
+//GLOBAL DEFINES//
+//////////////////
+
+#define SPEED_OF_LIGHT 3e8 //not exact but hey!
+#define SPEED_OF_LIGHT_SQ 9e+16
+#define FIRE_DAMAGE_MODIFIER 0.0215 //Higher values result in more external fire damage to the skin (default 0.0215)
+#define AIR_DAMAGE_MODIFIER 2.025 //More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
+#define INFINITY 1e31 //closer then enough
+
+	//Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
+#define MAX_MESSAGE_LEN 1024
+#define MAX_PAPER_MESSAGE_LEN 3072
+#define MAX_BOOK_MESSAGE_LEN 9216
+
+#define MAX_NAME_LEN 32
+
+/////////////////
+//RADIO DEFINES//
+/////////////////
+#define TRANSMISSION_WIRE	0
+#define TRANSMISSION_RADIO	1
+
+/* filters */
+#define RADIO_TO_AIRALARM "1"
+#define RADIO_FROM_AIRALARM "2"
+#define RADIO_CHAT "3"
+#define RADIO_ATMOSIA "4"
+#define RADIO_NAVBEACONS "5"
+#define RADIO_AIRLOCK "6"
+#define RADIO_SECBOT "7"
+#define RADIO_MULEBOT "8"
+#define RADIO_MAGNETS "9"
+#define RADIO_POWER "10"
\ No newline at end of file