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

Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type. (#2008)

Browse Source 
* Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type.

* Fixes an Oops made with Status. (Thanks Zuh)
This commit is contained in:
Mechoid
2016-06-30 06:03:53 -07:00
committed by Datraen
parent be3d6608e7
commit d1eb23ee8b
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,6 +121,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
I.mechassist() I.mechassist()
else if(status == "mechanical") else if(status == "mechanical")
I.robotize() I.robotize()
else if(status == "digital")
I.digitize()
return return
/datum/category_item/player_setup_item/general/body/content(var/mob/user) /datum/category_item/player_setup_item/general/body/content(var/mob/user)
@@ -197,6 +199,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(ind > 1) if(ind > 1)
. += ", " . += ", "
. += "\tSynthetic [organ_name]" . += "\tSynthetic [organ_name]"
else if(status == "digital")
++ind
if(ind > 1)
. += ", "
. += "\tDigital [organ_name]"
else if(status == "assisted") else if(status == "assisted")
++ind ++ind
if(ind > 1) if(ind > 1)
@@ -549,6 +556,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/list/organ_choices = list("Normal","Assisted","Mechanical") var/list/organ_choices = list("Normal","Assisted","Mechanical")
if(pref.organ_data[BP_TORSO] == "cyborg") if(pref.organ_data[BP_TORSO] == "cyborg")
organ_choices -= "Normal" organ_choices -= "Normal"
if(organ_name == "Brain")
organ_choices += "Digital"
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
if(!new_state) return if(!new_state) return
@@ -560,6 +569,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.organ_data[organ] = "assisted" pref.organ_data[organ] = "assisted"
if("Mechanical") if("Mechanical")
pref.organ_data[organ] = "mechanical" pref.organ_data[organ] = "mechanical"
if("Digital")
pref.organ_data[organ] = "digital"
return TOPIC_REFRESH return TOPIC_REFRESH
else if(href_list["disabilities"]) else if(href_list["disabilities"])

3
code/modules/mob/living/carbon/brain/brain_item.dm
View File

@@ -21,6 +21,9 @@
/obj/item/organ/internal/brain/mechassist() /obj/item/organ/internal/brain/mechassist()
replace_self_with(/obj/item/organ/internal/mmi_holder) replace_self_with(/obj/item/organ/internal/mmi_holder)
/obj/item/organ/internal/brain/digitize()
replace_self_with(/obj/item/organ/internal/mmi_holder/robot)
/obj/item/organ/internal/brain/proc/replace_self_with(replace_path) /obj/item/organ/internal/brain/proc/replace_self_with(replace_path)
var/mob/living/carbon/human/tmp_owner = owner var/mob/living/carbon/human/tmp_owner = owner
qdel(src) qdel(src)

3
code/modules/organs/organ.dm
View File

@@ -259,6 +259,9 @@ var/list/organ_cache = list()
min_bruised_damage = 15 min_bruised_damage = 15
min_broken_damage = 35 min_broken_damage = 35
/obj/item/organ/proc/digitize() //Used to make the circuit-brain. On this level in the event more circuit-organs are added/tweaks are wanted.
robotize()
/obj/item/organ/emp_act(severity) /obj/item/organ/emp_act(severity)
if(!(robotic >= ORGAN_ROBOT)) if(!(robotic >= ORGAN_ROBOT))
return return

9
code/modules/organs/subtypes/machine.dm
View File

@@ -90,3 +90,12 @@
..() ..()
stored_mmi.icon_state = "posibrain-occupied" stored_mmi.icon_state = "posibrain-occupied"
icon_state = stored_mmi.icon_state icon_state = stored_mmi.icon_state
/obj/item/organ/internal/mmi_holder/robot
name = "digital brain interface"
brain_type = /obj/item/device/mmi/digital/robot
/obj/item/organ/internal/mmi_holder/robot/update_from_mmi()
..()
stored_mmi.icon_state = "mainboard"
icon_state = stored_mmi.icon_state