More Merge Fixes (#1304)

* Fixes SQL saving of hex numbers
* Removes completed TODO-MERGE notes
* Changes one instance of Galactic Common to Ceti Basic
* Renames instances of blind.layer to blind.invisibility (as is proper)
* Fixes the SQL schema some more
* Implements pAI saving

code/modules/mob/living/carbon/human/species/species.dm

@@ -44,7 +44,7 @@
 	var/list/speech_sounds                   // A list of sounds to potentially play when speaking.
 	var/list/speech_chance                   // The likelihood of a speech sound playing.
 	var/num_alternate_languages = 0          // How many secondary languages are available to select at character creation
-	var/name_language = "Galactic Common"    // The language to use when determining names for this species, or null to use the first name/last name generator
+	var/name_language = "Ceti Basic"	    // The language to use when determining names for this species, or null to use the first name/last name generator
 
 	// Combat vars.
 	var/total_health = 100                   // Point at which the mob will enter crit.
@@ -360,7 +360,6 @@
 /datum/species/proc/get_vision_flags(var/mob/living/carbon/human/H)
 	return vision_flags
 
-// #TODO-MERGE: Search for blind.layer refs, change to blind.invisibility
 /datum/species/proc/handle_vision(var/mob/living/carbon/human/H)
 	H.update_sight()
 	H.sight |= get_vision_flags(H)
@@ -382,7 +381,7 @@
 		H.eye_blind = max(H.eye_blind, 1)
 
 	if(H.blind)
-		H.blind.layer = (H.eye_blind ? 18 : 0)
+		H.blind.invisibility = (H.eye_blind ? 18 : 0)
 
 	if(!H.client)//no client, no screen to update
 		return 1

code/modules/mob/living/life.dm

@@ -143,9 +143,9 @@
 
 	if(blind)
 		if(eye_blind)
-			blind.layer = 18
+			blind.invisibility = 18
 		else
-			blind.layer = 0
+			blind.invisibility = 0
 			if (disabilities & NEARSIGHTED)
 				client.screen += global_hud.vimpaired
 			if (eye_blurry)

code/modules/mob/living/silicon/pai/recruit.dm

@@ -75,9 +75,15 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 					candidate.comments = sanitize(t)
 
 			if("save")
-				candidate.savefile_save(usr)
+				if (config.sql_saves)
+					usr.client.prefs.save_preferences()
+				else
+					candidate.savefile_save(usr)
 			if("load")
-				candidate.savefile_load(usr)
+				if (config.sql_saves)
+					usr.client.prefs.load_preferences()
+				else
+					candidate.savefile_load(usr)
 				//In case people have saved unsanitized stuff.
 				if(candidate.name)
 					candidate.name = sanitizeSafe(candidate.name, MAX_NAME_LEN)
@@ -96,7 +102,10 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 							p.alertUpdate()
 				usr << browse(null, "window=paiRecruit")
 				return
-		candidate.savefile_save(usr)
+		if (config.sql_saves)
+			usr.client.prefs.save_preferences()
+		else
+			candidate.savefile_save(usr)
 		recruitWindow(usr, href_list["allow_submit"] != "0")
 
 /datum/paiController/proc/recruitWindow(var/mob/M as mob, allowSubmit = 1)
@@ -111,7 +120,12 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		candidate.key = M.key
 		pai_candidates.Add(candidate)
 
-	candidate.savefile_load(M)//Load the pAI config before displaying the window
+	// Load the data before displaying.
+	if (!config.sql_saves)
+		candidate.savefile_load(M)
+	else
+		M.client.prefs.load_preferences()
+
 	var/dat = ""
 	dat += {"
 			<style type="text/css">

code/modules/mob/living/silicon/silicon.dm

@@ -35,7 +35,6 @@
 /mob/living/silicon/New()
 	silicon_mob_list |= src
 	..()
-	// #TODO-MERGE: Search for all isntances of Galactic Common and REPLACE THE FUCK OUT OF THEM!
 	add_language("Ceti Basic")
 	init_id()
 
@@ -382,5 +381,3 @@
 			if (!underdoor)
 				spawn(3)//A slight delay to let us finish walking out from under the door
 					layer = initial(layer)
-
-

code/modules/mob/mob.dm

@@ -140,27 +140,6 @@
 	if (!self_served)
 		src.show_message(self_message, 1, blind_message, 2)
 
-// #TODO-MERGE: Check visible_message original define.
-// Show a message to all mobs in sight of this atom
-// Use for objects performing visible actions
-// message is output to anyone who can see, e.g. "The [src] does something!"
-// blind_message (optional) is what blind people will hear e.g. "You hear something!"
-// /atom/proc/visible_message(var/message, var/blind_message)
-// 	var/list/messageturfs = list()//List of turfs we broadcast to.
-// 	var/list/messagemobs = list()//List of living mobs nearby who can hear it, and distant ghosts who've chosen to hear it
-// 	for (var/turf in view(world.view, get_turf(src)))
-// 		messageturfs += turf
-//
-// 	for(var/mob/M in player_list)
-// 		if (!M.client || istype(M, /mob/new_player))
-// 			continue
-// 		if(get_turf(M) in messageturfs)
-// 			messagemobs += M
-//
-// 	for(var/mob/M in messagemobs)
-// 		M.show_message( message, 1, blind_message, 2)
-
-
 // Returns an amount of power drawn from the object (-1 if it's not viable).
 // If drain_check is set it will not actually drain power, just return a value.
 // If surge is set, it will destroy/damage the recipient and not return any power.