From dfe5afe197a22faf5b650bd2ca439ea892cf8802 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Wed, 29 Mar 2017 01:55:46 +0100 Subject: [PATCH 1/6] Changes character setup to use correct in-lore names for brain types. --- .../preference_setup/general/03_body.dm | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 079713c7ea..ab5cd15855 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -117,11 +117,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O continue var/obj/item/organ/I = character.internal_organs_by_name[name] if(I) - if(status == "assisted") + if(status == "cybernetic") I.mechassist() - else if(status == "mechanical") + else if(status == "positronic") I.robotize() - else if(status == "digital") + else if(status == "drone") I.digitize() return @@ -200,13 +200,17 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O ++ind if(ind > 1) . += ", " - . += "\tSynthetic [organ_name]" - else if(status == "digital") + switch(organ_name) + if ("brain") + . += "\tPositronic [organ_name]" + else + . += "\tSynthetic [organ_name]" + else if(status == "drone") ++ind if(ind > 1) . += ", " . += "\tDigital [organ_name]" - else if(status == "assisted") + else if(status == "cybernetic") ++ind if(ind > 1) . += ", " @@ -535,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] = "assisted" + pref.organ_data[O_BRAIN] = "cybernetic" for(var/internal_organ in list(O_HEART,O_EYES)) pref.organ_data[internal_organ] = "mechanical" @@ -556,15 +560,18 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O organ = O_LUNGS if("Brain") if(pref.organ_data[BP_HEAD] != "cyborg") - user << "You may only select an assisted or synthetic brain if you have a full prosthetic body." + user << "You may only select a cybernetic or synthetic brain if you have a full prosthetic body." return organ = "brain" - var/list/organ_choices = list("Normal","Assisted","Mechanical") + var/list/organ_choices = list("Normal","Cybernetic") if(pref.organ_data[BP_TORSO] == "cyborg") organ_choices -= "Normal" if(organ_name == "Brain") - organ_choices += "Digital" + organ_choices += "Drone" + organ_choices += "Positronic" + else + organ_choices += "Mechanical" var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in organ_choices if(!new_state) return @@ -572,12 +579,14 @@ 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("Mechanical") + if("Cybernetic") + pref.organ_data[organ] = "cybernetic" + if ("Mechanical") + pref.organ_data[organ] = "mechanical" + if("Drone") + pref.organ_data[organ] = "drone" + if("Positronic") pref.organ_data[organ] = "mechanical" - if("Digital") - pref.organ_data[organ] = "digital" return TOPIC_REFRESH else if(href_list["disabilities"]) From d5a9e15f282b9b3396af8ff0b66faf21b616b579 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Wed, 29 Mar 2017 03:07:52 +0100 Subject: [PATCH 2/6] Fixed get_FBP_type() method for determining min/max ages to use new type names. --- code/modules/client/preference_setup/preference_setup.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index f72ff0645c..63e3fc266d 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("assisted") + if("cybernetic") return PREF_FBP_CYBORG - if("mechanical") + if("positronic") return PREF_FBP_POSI - if("digital") + if("drone") return PREF_FBP_SOFTWARE return 0 //Something went wrong! From 7773ef71221a3a1827e2488b9147d66f7182c2ac Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Thu, 30 Mar 2017 18:01:20 +0100 Subject: [PATCH 3/6] 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! From 9e955cf999fa0cce258e8361861843d1c907176a Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Thu, 30 Mar 2017 18:04:21 +0100 Subject: [PATCH 4/6] Missed a spot. --- code/modules/client/preference_setup/general/03_body.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 70a95e2166..901d7efad7 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -117,11 +117,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O continue var/obj/item/organ/I = character.internal_organs_by_name[name] if(I) - if(status == "cybernetic") + if(status == "assisted") I.mechassist() - else if(status == "positronic") + else if(status == "mechanical") I.robotize() - else if(status == "drone") + else if(status == "digital") I.digitize() return From 2189d83812980bb18aadee2b27d0e779cea45cc1 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Thu, 30 Mar 2017 21:50:04 +0100 Subject: [PATCH 5/6] Fixed single leftover 'cybernetic' and 'drone' variables. --- code/modules/client/preference_setup/general/03_body.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 901d7efad7..1b1979e50c 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -205,12 +205,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O . += "\tPositronic [organ_name]" else . += "\tSynthetic [organ_name]" - else if(status == "drone") + else if(status == "digital") ++ind if(ind > 1) . += ", " . += "\tDigital [organ_name]" - else if(status == "cybernetic") + else if(status == "assisted") ++ind if(ind > 1) . += ", " From 98d3ebf6dd95fe077a29c958f48b5bf650e564c0 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Sat, 1 Apr 2017 03:09:55 +0100 Subject: [PATCH 6/6] Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes. --- code/modules/client/preference_setup/general/03_body.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 1b1979e50c..47167d34cf 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -574,6 +574,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O else organ_choices += "Assisted" organ_choices += "Mechanical" + 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 if(!new_state) return