From 5cb99a726b8bc5e8c44595fc35f243da9d853094 Mon Sep 17 00:00:00 2001
From: SoundScopes <Musical.Flow@LIve.com>
Date: Sun, 28 Dec 2014 02:04:27 +0000
Subject: [PATCH] Updates

---
 Scopes Files/gravitygenerator.dm  | 3 ++-
 code/controllers/configuration.dm | 3 +++
 code/controllers/voting.dm        | 3 +++
 code/game/machinery/Sleeper.dm    | 3 +++
 code/modules/admin/IsBanned.dm    | 1 -
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Scopes Files/gravitygenerator.dm b/Scopes Files/gravitygenerator.dm
index 7e03e17e..0f4d101e 100644
--- a/Scopes Files/gravitygenerator.dm	
+++ b/Scopes Files/gravitygenerator.dm	
@@ -431,10 +431,11 @@ var/list/gravity_field_generators = list() // We will keep track of this by addi
 	var/turf/our_turf = get_turf(src)
 	for(var/mob/M in mob_list)
 		var/turf/their_turf = get_turf(M)
+		if(!their_turf) continue
 		if(their_turf.z == our_turf.z)
 			M.update_gravity(M.mob_has_gravity())
 			if(M.client)
-				if(!M)	return
+				if(!M)	continue
 				shake_camera(M, 5, 1)
 				M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5)
 
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 598d1eb4..b6e38961 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -437,6 +437,9 @@
 				if("tor_ban")
 					ToRban = 1
 
+				if("ip_blacklist_enabled")
+					ip_blacklist_enabled = 1
+
 				if("automute_on")
 					automute_on = 1
 
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index e0b253a4..e8a485b6 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -122,6 +122,9 @@ datum/controller/vote
 					choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor)
 					world << "<font color='purple'>Crew Transfer Factor: [factor]</font>"
 					greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"])
+		if(mode == "crew_transfer")
+			choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] - round(total_votes / 3))
+			greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"])
 
 
 		//get all options with that many votes and return them in a list
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index c4f018da..77cd4aa0 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -311,6 +311,9 @@
 			M:reagents.add_reagent("inaprovaline", 5)
 		return
 	proc/toggle_filter()
+		if(!src.occupant)
+			filtering = 0
+			return
 		if(filtering)
 			filtering = 0
 		else
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 164db030..95194470 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -32,7 +32,6 @@ world/IsBanned(key,address,computer_id)
 					continue
 
 				var/banned_address = copytext(line, 1, length(line)+1)
-				testing("Blacklist: address:[address] - banned_address:[banned_address]")
 				if(banned_address == address)
 					log_access("Failed Login: [src] - Blacklisted IP")
 					message_admins("\blue Failed Login: [src] - Blacklisted IP")