Adds more customization to robotic internal organs but it is not broken (#13068)

This commit is contained in:
Alberyk
2022-02-06 18:07:42 -03:00
committed by GitHub
parent ea5f66fa4c
commit f42edd018e
30 changed files with 130 additions and 60 deletions
+17 -2
View File
@@ -63,16 +63,31 @@
. += "[get_wound_severity(get_scarring_level())] scarring"
/obj/item/organ/internal/is_usable()
return ..() && !is_broken()
if(robotize_type)
var/datum/robolimb/R = all_robolimbs[robotize_type]
if(!R.malfunctioning_check(owner))
return TRUE
else
return ..() && !is_broken()
/obj/item/organ/internal/proc/is_damaged()
return damage > 0
/obj/item/organ/internal/robotize()
/obj/item/organ/internal/robotize(var/company = "Unbranded")
..()
min_bruised_damage += 5
min_broken_damage += 10
if(company)
model = company
var/datum/robolimb/R = all_robolimbs[company]
if(R)
if(robotic_sprite)
icon_state = "[initial(icon_state)]-[R.internal_organ_suffix]"
robotize_type = company
/obj/item/organ/internal/proc/getToxLoss()
if(BP_IS_ROBOTIC(src))
return damage * 0.5
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/item/organ/internal/appendix/process()
..()
if(inflamed && owner)
if(inflamed && owner && !(status & ORGAN_ROBOT))
inflamed++
if(prob(5))
if(owner.can_feel_pain())
-1
View File
@@ -5,7 +5,6 @@
organ_tag = BP_EYES
parent_organ = BP_HEAD
robotic_name = "optical sensors"
robotic_sprite = "eyes-prosthetic"
max_damage = 45
relative_size = 5
var/list/eye_colour = list(0,0,0)
-1
View File
@@ -5,7 +5,6 @@
parent_organ = BP_CHEST
dead_icon = "heart-off"
robotic_name = "circulatory pump"
robotic_sprite = "heart-prosthetic"
toxin_type = CE_CARDIOTOXIC
max_damage = 45
-1
View File
@@ -5,7 +5,6 @@
organ_tag = BP_KIDNEYS
parent_organ = BP_GROIN
robotic_name = "prosthetic kidneys"
robotic_sprite = "kidneys-prosthetic"
min_bruised_damage = 25
min_broken_damage = 45
max_damage = 70
-1
View File
@@ -4,7 +4,6 @@
organ_tag = BP_LIVER
parent_organ = BP_GROIN
robotic_name = "toxin filter"
robotic_sprite = "liver-prosthetic"
toxin_type = CE_HEPATOTOXIC
min_bruised_damage = 25
min_broken_damage = 55
-1
View File
@@ -7,7 +7,6 @@
organ_tag = BP_LUNGS
parent_organ = BP_CHEST
robotic_name = "gas exchange system"
robotic_sprite = "lungs-prosthetic"
min_bruised_damage = 30
min_broken_damage = 45
toxin_type = CE_PNEUMOTOXIC
@@ -1,7 +1,7 @@
/obj/item/organ/internal/eyes/night
name = "light sensitive eyes"
desc = "A pair of Tajaran eyes accustomed to the low light conditions of Adhomai."
icon_state = "tajaran_eyes"
icon = 'icons/obj/organs/tajara_organs.dmi'
action_button_name = "Activate Low Light Vision"
default_action_type = /datum/action/item_action/organ/night_eyes
relative_size = 8
@@ -109,31 +109,31 @@
/obj/item/organ/internal/stomach/tajara
name = "reinforced stomach"
desc = "A Tajara stomach adapted to help the body conserve energy during digestion."
icon_state = "tajaran_stomach"
icon = 'icons/obj/organs/tajara_organs.dmi'
stomach_volume = 80
/obj/item/organ/internal/lungs/tajara
name = "insulated lungs"
desc = "A pair of Tajaran lungs that help preserve the warmth of the air while breathing."
icon_state = "tajaran_lungs"
icon = 'icons/obj/organs/tajara_organs.dmi'
/obj/item/organ/internal/liver/tajara
desc = "An alien liver capable of filtering Adhomian toxins and chemicals."
icon_state = "tajaran_liver"
icon = 'icons/obj/organs/tajara_organs.dmi'
/obj/item/organ/internal/heart/tajara
desc = "A robust heart capable of helping to preserve body temperature through blood circulation."
icon_state = "tajaran_heart"
dead_icon = "tajaran_heart"
icon = 'icons/obj/organs/tajara_organs.dmi'
/obj/item/organ/internal/kidneys/tajara
desc = "Alien kidneys adapted to the Tajaran physiology."
icon_state = "tajaran_kidneys"
icon = 'icons/obj/organs/tajara_organs.dmi'
/obj/item/organ/internal/brain/tajara
icon_state = "tajaran_brain"
icon = 'icons/obj/organs/tajara_organs.dmi'
/obj/item/organ/internal/appendix/tajara
name = "fat reservoir"
icon_state = "tajaran_appendix"
icon = 'icons/obj/organs/tajara_organs.dmi'
desc = "An Adhomian organ that stores fat and nutrients for the winter."
possible_modifications = list("Normal","Assisted","Mechanical", "Removed")
@@ -1,28 +1,28 @@
/obj/item/organ/internal/stomach/unathi
name = "massive gizzard"
desc = "A much larger stomach than what humans have. Looks to belong to a carnivore."
icon_state = "unathi_stomach"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/brain/unathi
icon_state = "unathi_brain"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/lungs/unathi
name = "large lungs"
desc = "A pair of two large lungs belonging to Unathi, similar in appearance to yet much larger than Human lungs."
icon_state = "unathi_lungs"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/heart/unathi
name = "large heart"
desc = "A single large heart almost triple the size of your hand, used to effectively pump blood throughout a body without transporting much heat. It looks to have only one ventricle."
icon_state = "unathi_heart"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/liver/unathi
icon_state = "unathi_liver"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/kidneys/unathi
icon_state = "unathi_kidneys"
icon = 'icons/obj/organs/unathi_organs.dmi'
/obj/item/organ/internal/eyes/unathi
name = "reptilian eyes"
desc = "A pair of reptilian eyes. The pupil is slit and never dialating; you can almost feel it staring at you."
icon_state = "unathi_eyes"
icon = 'icons/obj/organs/unathi_organs.dmi'
@@ -1,8 +1,8 @@
/obj/item/organ/internal/eyes/night/vaurca
name = "vaurcaesian eyes"
desc = "A set of four vaurcaesian eyes, adapted to the low or no light tunnels of Sedantis."
icon_state = "eyes_vaurca"
robotic_sprite = null
icon = 'icons/obj/organs/vaurca_organs.dmi'
robotic_sprite = FALSE
vision_color = /datum/client_color/vaurca
vision_mechanical_color = /datum/client_color/monochrome
eye_emote = "'s eyes gently shift."
-1
View File
@@ -8,7 +8,6 @@
organ_tag = BP_STOMACH
parent_organ = BP_GROIN
robotic_name = "digestive pump"
robotic_sprite = "stomach-prosthetic"
var/datum/reagents/metabolism/ingested
var/next_cramp = 0
var/should_process_alcohol = TRUE