cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dialled back changes to only effect menu display text for brains.

Browse Source 
Reverted variable names to original assisted/mechanical/digital to prevent potential issues in other code which may rely on them.
This commit is contained in:
Cerebulon
2017-03-30 18:01:20 +01:00
parent d5a9e15f28
commit 7773ef7122
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -539,7 +539,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.organ_data[other_limb] = "cyborg" pref.organ_data[other_limb] = "cyborg"
pref.rlimb_data[other_limb] = choice pref.rlimb_data[other_limb] = choice
if(!pref.organ_data[O_BRAIN]) 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)) for(var/internal_organ in list(O_HEART,O_EYES))
pref.organ_data[internal_organ] = "mechanical" pref.organ_data[internal_organ] = "mechanical"
@@ -564,13 +564,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return return
organ = "brain" organ = "brain"
var/list/organ_choices = list("Normal","Cybernetic") var/list/organ_choices = list("Normal")
if(pref.organ_data[BP_TORSO] == "cyborg") if(pref.organ_data[BP_TORSO] == "cyborg")
organ_choices -= "Normal" organ_choices -= "Normal"
if(organ_name == "Brain") if(organ_name == "Brain")
organ_choices += "Drone" organ_choices += "Cybernetic"
organ_choices += "Positronic" organ_choices += "Positronic"
organ_choices += "Drone"
else else
organ_choices += "Assisted"
organ_choices += "Mechanical" organ_choices += "Mechanical"
var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in organ_choices 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) switch(new_state)
if("Normal") if("Normal")
pref.organ_data[organ] = null pref.organ_data[organ] = null
if("Assisted")
pref.organ_data[organ] = "assisted"
if("Cybernetic") if("Cybernetic")
pref.organ_data[organ] = "cybernetic" pref.organ_data[organ] = "assisted"
if ("Mechanical") if ("Mechanical")
pref.organ_data[organ] = "mechanical" pref.organ_data[organ] = "mechanical"
if("Drone") if("Drone")
pref.organ_data[organ] = "drone" pref.organ_data[organ] = "digital"
if("Positronic") if("Positronic")
pref.organ_data[organ] = "mechanical" pref.organ_data[organ] = "mechanical"
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["disabilities"]) else if(href_list["disabilities"])

6
code/modules/client/preference_setup/preference_setup.dm
View File

@@ -264,11 +264,11 @@
if(!is_FBP()) if(!is_FBP())
return 0 // Not a robot. return 0 // Not a robot.
switch(pref.organ_data["brain"]) switch(pref.organ_data["brain"])
if("cybernetic") if("assisted")
return PREF_FBP_CYBORG return PREF_FBP_CYBORG
if("positronic") if("mechanical")
return PREF_FBP_POSI return PREF_FBP_POSI
if("drone") if("digital")
return PREF_FBP_SOFTWARE return PREF_FBP_SOFTWARE
return 0 //Something went wrong! return 0 //Something went wrong!