diff --git a/baystation12.dme b/baystation12.dme
index 5f69e8ea44..143149c577 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -27,7 +27,6 @@
#include "code\__defines\misc.dm"
#include "code\__defines\mobs.dm"
#include "code\__defines\research.dm"
-#include "code\__defines\species.dm"
#include "code\__defines\species_languages.dm"
#include "code\_helpers\datum_pool.dm"
#include "code\_helpers\files.dm"
@@ -1749,4 +1748,9 @@
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\exodus-1.dmm"
+#include "maps\exodus-2.dmm"
+#include "maps\exodus-3.dmm"
+#include "maps\exodus-4.dmm"
+#include "maps\exodus-5.dmm"
+#include "maps\exodus-6.dmm"
// END_INCLUDE
diff --git a/code/__defines/atmos.dm b/code/__defines/atmos.dm
index bb673f63fe..53bbe67edd 100644
--- a/code/__defines/atmos.dm
+++ b/code/__defines/atmos.dm
@@ -83,7 +83,4 @@
//Flags for zone sleeping
#define ZONE_ACTIVE 1
-#define ZONE_SLEEPING 0
-
-#define SPEED_OF_LIGHT 3e8 // Approximate.
-#define SPEED_OF_LIGHT_SQ 9e16
\ No newline at end of file
+#define ZONE_SLEEPING 0
\ No newline at end of file
diff --git a/code/__defines/math_physics.dm b/code/__defines/math_physics.dm
index 9b339d4066..7c7c6d0d85 100644
--- a/code/__defines/math_physics.dm
+++ b/code/__defines/math_physics.dm
@@ -1,7 +1,5 @@
// Math constants.
-#define M_E 2.71828183
#define M_PI 3.14159265
-#define M_SQRT2 1.41421356
#define R_IDEAL_GAS_EQUATION 8.31 // kPa*L/(K*mol).
#define ONE_ATMOSPHERE 101.325 // kPa.
diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index fdaa07c594..f2a96d460d 100644
--- a/code/__defines/misc.dm
+++ b/code/__defines/misc.dm
@@ -132,11 +132,6 @@
#define CUSTOM_ITEM_SYNTH 'icons/mob/custom_synthetic.dmi'
#endif
-// Metal sheets, glass sheets, and rod stacks.
-#define MAX_STACK_AMOUNT_METAL 50
-#define MAX_STACK_AMOUNT_GLASS 50
-#define MAX_STACK_AMOUNT_RODS 60
-
#define WALL_CAN_OPEN 1
#define WALL_OPENING 2
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 75166b3f48..b1db28062b 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -472,16 +472,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
// mob_list.Add(M)
return moblist
-//E = MC^2
-/proc/convert2energy(var/M)
- var/E = M*(SPEED_OF_LIGHT_SQ)
- return E
-
-//M = E/C^2
-/proc/convert2mass(var/E)
- var/M = E/(SPEED_OF_LIGHT_SQ)
- return M
-
//Forces a variable to be posative
/proc/modulus(var/M)
if(M >= 0)
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index f4b88f8850..469df7305a 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -170,8 +170,8 @@ datum/controller/vote
additional_antag_types |= antag_names_to_ids[.]
if(mode == "gamemode") //fire this even if the vote fails.
- if(!going)
- going = 1
+ if(!round_progressing)
+ round_progressing = 1
world << "The round will start soon."
if(restart)
@@ -265,8 +265,8 @@ datum/controller/vote
world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
if("custom")
world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
- if(mode == "gamemode" && going)
- going = 0
+ if(mode == "gamemode" && round_progressing)
+ round_progressing = 0
world << "Round start has been delayed."
time_remaining = round(config.vote_period/10)
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 0b1f24121a..81f64ef6f9 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -51,7 +51,7 @@ var/global/datum/controller/gameticker/ticker
for(var/i=0, i<10, i++)
sleep(1)
vote.process()
- if(going)
+ if(round_progressing)
pregame_timeleft--
if(pregame_timeleft == config.vote_autogamemode_timeleft)
if(!vote.time_remaining)
diff --git a/code/global.dm b/code/global.dm
index 6455ff02ec..b2222ca3f0 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -31,7 +31,7 @@ var/game_version = "Baystation12"
var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
-var/roundstart_nodelay = 1
+var/round_progressing = 1
var/master_mode = "extended" // "extended"
var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode.
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index cd6dfda8db..d27359acfc 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -909,8 +909,8 @@ var/global/floorIsLava = 0
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
return //alert("Round end delayed", null, null, null, null, null)
- going = !( going )
- if (!( going ))
+ round_progressing = !round_progressing
+ if (!round_progressing)
world << "The game start has been delayed."
log_admin("[key_name(usr)] delayed the game.")
else
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 1e18882137..0fdbaf749c 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -81,7 +81,7 @@
stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
if(ticker.current_state == GAME_STATE_PREGAME)
- stat("Time To Start:", "[ticker.pregame_timeleft][going ? "" : " (DELAYED)"]")
+ stat("Time To Start:", "[ticker.pregame_timeleft][round_progressing ? "" : " (DELAYED)"]")
stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
totalPlayers = 0
totalPlayersReady = 0