From 7773ef71221a3a1827e2488b9147d66f7182c2ac Mon Sep 17 00:00:00 2001
From: Cerebulon <tanhindmarsh@yahoo.com>
Date: Thu, 30 Mar 2017 18:01:20 +0100
Subject: [PATCH] Dialled back changes to only effect menu display text for
 brains. Reverted variable names to original assisted/mechanical/digital to
 prevent potential issues in other code which may rely on them.

---
 .../client/preference_setup/general/03_body.dm    | 15 ++++++++++-----
 .../client/preference_setup/preference_setup.dm   |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index ab5cd15855..70a95e2166 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -539,7 +539,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 						pref.organ_data[other_limb] = "cyborg"
 						pref.rlimb_data[other_limb] = choice
 					if(!pref.organ_data[O_BRAIN])
-						pref.organ_data[O_BRAIN] = "cybernetic"
+						pref.organ_data[O_BRAIN] = "assisted"
 					for(var/internal_organ in list(O_HEART,O_EYES))
 						pref.organ_data[internal_organ] = "mechanical"
 
@@ -564,13 +564,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 					return
 				organ = "brain"
 
-		var/list/organ_choices = list("Normal","Cybernetic")
+		var/list/organ_choices = list("Normal")
 		if(pref.organ_data[BP_TORSO] == "cyborg")
 			organ_choices -= "Normal"
 			if(organ_name == "Brain")
-				organ_choices += "Drone"
+				organ_choices += "Cybernetic"
 				organ_choices += "Positronic"
+				organ_choices += "Drone"
 			else
+				organ_choices += "Assisted"
 				organ_choices += "Mechanical"
 
 		var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in organ_choices
@@ -579,14 +581,17 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 		switch(new_state)
 			if("Normal")
 				pref.organ_data[organ] = null
+			if("Assisted")
+				pref.organ_data[organ] = "assisted"
 			if("Cybernetic")
-				pref.organ_data[organ] = "cybernetic"
+				pref.organ_data[organ] = "assisted"
 			if ("Mechanical")
 				pref.organ_data[organ] = "mechanical"
 			if("Drone")
-				pref.organ_data[organ] = "drone"
+				pref.organ_data[organ] = "digital"
 			if("Positronic")
 				pref.organ_data[organ] = "mechanical"
+
 		return TOPIC_REFRESH
 
 	else if(href_list["disabilities"])
diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
index 63e3fc266d..f72ff0645c 100644
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -264,11 +264,11 @@
 	if(!is_FBP())
 		return 0 // Not a robot.
 	switch(pref.organ_data["brain"])
-		if("cybernetic")
+		if("assisted")
 			return PREF_FBP_CYBORG
-		if("positronic")
+		if("mechanical")
 			return PREF_FBP_POSI
-		if("drone")
+		if("digital")
 			return PREF_FBP_SOFTWARE
 	return 0 //Something went wrong!