From 0868c344ccaa4e883cbbdc2c567dc567a31f1d90 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 1 Aug 2014 23:50:33 +0930
Subject: [PATCH] Adjustments and a typo fix.

---
 code/game/gamemodes/calamity/calamity.dm      | 27 -------------------
 code/game/gamemodes/game_mode.dm              | 25 +++++++++++++++++
 code/modules/mob/living/carbon/carbon.dm      |  2 +-
 .../modules/mob/living/simple_animal/borer.dm |  2 ++
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm
index 52f6501245..c2ab3202f4 100644
--- a/code/game/gamemodes/calamity/calamity.dm
+++ b/code/game/gamemodes/calamity/calamity.dm
@@ -7,33 +7,6 @@
  * ~ Zuhayr
  */
 
-//temp, move these somewhere appropriate
-/proc/show_generic_antag_text(var/datum/mind/player)
-	if(player.current)
-		player.current << \
-		"You are an antagonist! <font color=blue>Within the rules,</font> \
-		try to act as an opposing force to the crew. Further RP and try to make sure \
-		other players have <i>fun</i>! If you are confused or at a loss, always adminhelp, \
-		and before taking extreme actions, please try to also contact the administration! \
-		Think through your actions and make the roleplay immersive! <b>Please remember all \
-		rules aside from those without explicit exceptions apply to antagonists.</b>"
-
-/proc/show_objectives(var/datum/mind/player)
-
-	if(!player || !player.current) return
-
-	if(config.objectives_disabled)
-		show_generic_antag_text(player)
-		return
-
-	var/obj_count = 1
-	player.current << "\blue Your current objectives:"
-	for(var/datum/objective/objective in player.objectives)
-		player.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
-		obj_count++
-
-/datum/game_mode/var/list/borers = list()
-
 /datum/game_mode/calamity
 	name = "calamity"
 	config_tag = "calamity"
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 415d1362be..a566c2d101 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -481,3 +481,28 @@ proc/get_nt_opposed()
 				dudes += man
 	if(dudes.len == 0) return null
 	return pick(dudes)
+
+//Announces objectives/generic antag text.
+/proc/show_generic_antag_text(var/datum/mind/player)
+	if(player.current)
+		player.current << \
+		"You are an antagonist! <font color=blue>Within the rules,</font> \
+		try to act as an opposing force to the crew. Further RP and try to make sure \
+		other players have <i>fun</i>! If you are confused or at a loss, always adminhelp, \
+		and before taking extreme actions, please try to also contact the administration! \
+		Think through your actions and make the roleplay immersive! <b>Please remember all \
+		rules aside from those without explicit exceptions apply to antagonists.</b>"
+
+/proc/show_objectives(var/datum/mind/player)
+
+	if(!player || !player.current) return
+
+	if(config.objectives_disabled)
+		show_generic_antag_text(player)
+		return
+
+	var/obj_count = 1
+	player.current << "\blue Your current objectives:"
+	for(var/datum/objective/objective in player.objectives)
+		player.current << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
+		obj_count++
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 22989c3f71..4de06df651 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -470,7 +470,7 @@
 		return
 
 	if(B.chemicals >= 100)
-		src << "\red <B>Your host twitches and quivers as you rapdly excretea larva from your sluglike body.</B>"
+		src << "\red <B>Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.</B>"
 		visible_message("\red <B>[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!</B>")
 		B.chemicals -= 100
 		B.has_reproduced = 1
diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm
index 6033c02a25..7ffd57e96a 100644
--- a/code/modules/mob/living/simple_animal/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer.dm
@@ -1,3 +1,5 @@
+/datum/game_mode/var/list/borers = list()
+
 /mob/living/captive_brain
 	name = "host brain"
 	real_name = "host brain"