From 082af8f6385b58cdc2d5b2607915f9b6013cb376 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Mon, 21 Jan 2013 04:56:20 +1000
Subject: [PATCH] removed some duplicate events code brought in by mistake
 during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus'

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/game/gamemodes/events.dm | 51 ++---------------------------------
 code/global.dm                |  2 +-
 2 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index fccb79cdbf5..a8b1cb26924 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -77,57 +77,10 @@
 		return 0
 
 	switch(picked_event)
-		if("Meteor")
-			command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
-			for(var/mob/M in player_list)
-				if(!istype(M,/mob/new_player))
-					M << sound('sound/AI/meteors.ogg')
-			spawn(100)
-				meteor_wave()
-				spawn_meteors()
-			spawn(700)
-				meteor_wave()
-				spawn_meteors()
-
-		if(2)
-			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			for(var/mob/M in player_list)
-				if(!istype(M,/mob/new_player))
-					M << sound('sound/AI/granomalies.ogg')
-			var/turf/T = pick(blobstart)
-			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
-			spawn(rand(50, 300))
-				del(bh)
-		/*
-		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
-			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/spanomalies.ogg')
-			var/list/turfs = new
-			var/turf/picked
-			for(var/turf/simulated/floor/T in world)
-				if(T.z == 1)
-					turfs += T
-			for(var/turf/simulated/floor/T in turfs)
-				if(prob(20))
-					spawn(50+rand(0,3000))
-						picked = pick(turfs)
-						var/obj/effect/portal/P = new /obj/effect/portal( T )
-						P.target = picked
-						P.creator = null
-						P.icon = 'icons/obj/objects.dmi'
-						P.failchance = 0
-						P.icon_state = "anom"
-						P.name = "wormhole"
-						spawn(rand(300,600))
-							del(P)
-		*/
-		if(3)
-			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-				space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
-		if(4)			mini_blob_event()
 		if("Space Ninja")
 			//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
-			space_ninja_arrival()
+			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)
+				space_ninja_arrival()
 		if("Radiation")
 			high_radiation_event()
 		if("Virus")
diff --git a/code/global.dm b/code/global.dm
index 62c22b46622..8e1c8dc1c90 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -70,7 +70,7 @@ var/blobevent = 0
 var/diary = null
 var/diaryofmeanpeople = null
 var/href_logfile = null
-var/station_name = "NSV Exodus"
+var/station_name = "NSS Exodus"
 var/game_version = "Baystation12"
 var/changelog_hash = ""