diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 16d9e4cb92d..d9345f5b73d 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -270,6 +270,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O out += "
  • - Surgically Altered [capitalize_first_letters(parse_zone(organ_name))]
  • " if(BP_EYES) out += "
  • - Retinal Overlayed [capitalize_first_letters(parse_zone(organ_name))]
  • " + if(BP_BRAIN) + out += "
  • - Positronic-Implanted [capitalize_first_letters(parse_zone(organ_name))]
  • " else out += "
  • - Mechanically Assisted [capitalize_first_letters(parse_zone(organ_name))]
  • " else if(status == ORGAN_PREF_REMOVED) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index a00bd1bd78f..477d9f45831 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -294,7 +294,7 @@ var/bodyfall_sound = /singleton/sound_category/bodyfall_sound //default, can be used for species specific falling sounds var/footsound = /singleton/sound_category/blank_footsteps //same as above but for footsteps without shoes - var/list/alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_KIDNEYS, BP_STOMACH, BP_APPENDIX) //what internal organs can be changed in character setup + var/list/alterable_internal_organs = list(BP_HEART, BP_EYES, BP_LUNGS, BP_LIVER, BP_BRAIN, BP_KIDNEYS, BP_STOMACH, BP_APPENDIX) //what internal organs can be changed in character setup var/list/possible_external_organs_modifications = list("Normal","Amputated","Prosthesis") /// These are the prefixes of the icon states in talk.dmi. var/list/possible_speech_bubble_types = list("default") diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm index 4bed2eabe12..53ea296fc11 100644 --- a/code/modules/organs/internal/_internal.dm +++ b/code/modules/organs/internal/_internal.dm @@ -91,6 +91,10 @@ robotize_type = company +/obj/item/organ/internal/mechassist() + ..() + icon_state = "[initial(icon_state)]-assisted" + /obj/item/organ/internal/proc/getToxLoss() if(BP_IS_ROBOTIC(src)) return damage * 0.5 diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index 4b3abdcbfb8..dfd70db65fc 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -3,6 +3,7 @@ desc = "A piece of juicy meat found in a person's head." organ_tag = BP_BRAIN parent_organ = BP_HEAD + possible_modifications = list ("Normal","Assisted") vital = TRUE icon_state = "brain" force = 1 diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 6817886b3f3..ea871dc2c45 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -389,6 +389,8 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) name = "pacemaker-assisted [initial(name)]" if(BP_EYES) name = "retinal overlayed [initial(name)]" + if(BP_BRAIN) + name = "positronic-implanted [initial(name)]" else name = "mechanically assisted [initial(name)]" icon_state = initial(icon_state) @@ -401,7 +403,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) var/organ_fragility = 0.5 - if((status & ORGAN_ROBOT)) //fully robotic organs take the normal emp damage, assited ones only suffer half of it + if((status & ORGAN_ROBOT)) //fully robotic organs take the normal emp damage, assisted ones only suffer half of it organ_fragility = 1 switch (severity) diff --git a/html/changelogs/GeneralCamo - Assisted Organs.yml b/html/changelogs/GeneralCamo - Assisted Organs.yml new file mode 100644 index 00000000000..e9cba74f80d --- /dev/null +++ b/html/changelogs/GeneralCamo - Assisted Organs.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added sprites for assisted organs." + - rscadd: "Added assisted brains." diff --git a/icons/obj/organs/organs.dmi b/icons/obj/organs/organs.dmi index 8e47b189d82..d835fa33d9e 100644 Binary files a/icons/obj/organs/organs.dmi and b/icons/obj/organs/organs.dmi differ