From fd59c3ad76bdd755b6bf51f6513cf0ada4ecca94 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 4 Dec 2015 17:08:48 +1030
Subject: [PATCH] More tweaks to IPC fixes.

---
 code/__defines/damage_organs.dm             | 11 -----------
 code/game/machinery/rechargestation.dm      |  8 ++++----
 code/modules/client/preferences_savefile.dm | 11 ++++++-----
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/code/__defines/damage_organs.dm b/code/__defines/damage_organs.dm
index ca9cd28510..6a2fa0c267 100644
--- a/code/__defines/damage_organs.dm
+++ b/code/__defines/damage_organs.dm
@@ -40,17 +40,6 @@
 #define ORGAN_MUTATED    (1<<7)
 #define ORGAN_ASSISTED   (1<<8)
 
-/*// Organ defines.
-#define ORGAN_CUT_AWAY   1
-#define ORGAN_BLEEDING   2
-#define ORGAN_BROKEN     4
-#define ORGAN_DESTROYED  8
-#define ORGAN_ROBOT      16
-#define ORGAN_SPLINTED   32
-#define ORGAN_DEAD       64
-#define ORGAN_MUTATED    128
-#define ORGAN_ASSISTED   256*/
-
 #define DROPLIMB_EDGE 0
 #define DROPLIMB_BLUNT 1
 #define DROPLIMB_BURN 2
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index c35c419a42..1891170020 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -207,14 +207,14 @@
 
 /obj/machinery/recharge_station/proc/go_in(var/mob/living/silicon/robot/R)
 
+	if(occupant)
+		return
+
 	if(istype(R, /mob/living/silicon/robot))
-		if(!istype(R))
-			return
-		if(occupant)
-			return
 
 		if(R.incapacitated())
 			return
+
 		if(!R.cell)
 			return
 
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index f1b7eb5e0d..3de456d9e7 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -189,14 +189,15 @@
 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
 
-	if(species == "Machine")
-		real_name		= sanitizeName(real_name,,1)
-	else
-		real_name		= sanitizeName(real_name)
-
 	if(isnull(species) || !(species in playable_species))
 		species = "Human"
 
+	var/datum/species/cur_species = all_species[species]
+	if(istype(cur_species))
+		real_name = cur_species.sanitize_name(real_name)
+	else
+		real_name = sanitizeName(real_name)
+
 	if(isnum(underwear))
 		var/list/undies = gender == MALE ? underwear_m : underwear_f
 		underwear = undies[undies[underwear]]