Skip to content

Commit

Permalink
Assisted organ sprites, and assisted brains (#19087)
Browse files Browse the repository at this point in the history
This PR adds several sprites for assisted organs, which previously
lacked any sprites at all. In addition, this adds an assisted brain,
which is now available to pick in character creation. Long-term, I'd
like to look into adding assisted implants into the medical gameplay
loop, but for now these are character-creation only. "Mechanical"
prosthetic brains are not possible, and have been excised entirely.

### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/obj/organs/organs.dmi | Mechoid (Polaris) | CC-BY-SA |

---------

Co-authored-by: Cody Brittain <[email protected]>
  • Loading branch information
Generalcamo and Cody Brittain authored May 9, 2024
1 parent 20ae483 commit c01768e
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 2 deletions.
2 changes: 2 additions & 0 deletions code/modules/client/preference_setup/general/03_body.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
out += "<li>- Surgically Altered [capitalize_first_letters(parse_zone(organ_name))]</li>"
if(BP_EYES)
out += "<li>- Retinal Overlayed [capitalize_first_letters(parse_zone(organ_name))]</li>"
if(BP_BRAIN)
out += "<li>- Positronic-Implanted [capitalize_first_letters(parse_zone(organ_name))]</li>"
else
out += "<li>- Mechanically Assisted [capitalize_first_letters(parse_zone(organ_name))]</li>"
else if(status == ORGAN_PREF_REMOVED)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/species/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions code/modules/organs/internal/_internal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/organs/internal/brain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion code/modules/organs/organ.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/GeneralCamo - Assisted Organs.yml
Original file line number Diff line number Diff line change
@@ -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."
Binary file modified icons/obj/organs/organs.dmi
Binary file not shown.

0 comments on commit c01768e

Please sign in to comment.