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

Merge pull request #6048 from Heroman3003/promcore-decay-fix

Browse Source 
Fixes promethean cores decaying pointlessly
This commit is contained in:
Neerti
2019-04-08 12:01:02 -04:00
committed by VirgoBot
parent 8a20635d9e
commit fd4dc97a8b
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/organs/internal/brain.dm
View File

@@ -152,6 +152,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
name = "slime core" name = "slime core"
desc = "A complex, organic knot of jelly and crystalline particles." desc = "A complex, organic knot of jelly and crystalline particles."
icon_state = "core" icon_state = "core"
decays = FALSE
parent_organ = BP_TORSO parent_organ = BP_TORSO
clone_source = TRUE clone_source = TRUE
flags = OPENCONTAINER flags = OPENCONTAINER

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

@@ -6,30 +6,31 @@ var/list/organ_cache = list()
germ_level = 0 germ_level = 0
// Strings. // Strings.
var/organ_tag = "organ" // Unique identifier. var/organ_tag = "organ" // Unique identifier.
var/parent_organ = BP_TORSO // Organ holding this object. var/parent_organ = BP_TORSO // Organ holding this object.
// Status tracking. // Status tracking.
var/status = 0 // Various status flags var/status = 0 // Various status flags
var/vital // Lose a vital limb, die immediately. var/vital // Lose a vital limb, die immediately.
var/damage = 0 // Current damage to the organ var/damage = 0 // Current damage to the organ
var/robotic = 0 var/robotic = 0
// Reference data. // Reference data.
var/mob/living/carbon/human/owner // Current mob owning the organ. var/mob/living/carbon/human/owner // Current mob owning the organ.
var/list/transplant_data // Transplant match data. var/list/transplant_data // Transplant match data.
var/list/autopsy_data = list() // Trauma data for forensics. var/list/autopsy_data = list() // Trauma data for forensics.
var/list/trace_chemicals = list() // Traces of chemicals in the organ. var/list/trace_chemicals = list() // Traces of chemicals in the organ.
var/datum/dna/dna // Original DNA. var/datum/dna/dna // Original DNA.
var/datum/species/species // Original species. var/datum/species/species // Original species.
// Damage vars. // Damage vars.
var/min_bruised_damage = 10 // Damage before considered bruised var/min_bruised_damage = 10 // Damage before considered bruised
var/min_broken_damage = 30 // Damage before becoming broken var/min_broken_damage = 30 // Damage before becoming broken
var/max_damage // Damage cap var/max_damage // Damage cap
var/can_reject = 1 // Can this organ reject? var/can_reject = 1 // Can this organ reject?
var/rejecting // Is this organ already being rejected? var/rejecting // Is this organ already being rejected?
var/preserved = 0 // If this is 1, prevents organ decay. var/decays = TRUE // Can this organ decay at all?
var/preserved = 0 // If this is 1, prevents organ decay.
// Language vars. Putting them here in case we decide to do something crazy with sign-or-other-nonverbal languages. // Language vars. Putting them here in case we decide to do something crazy with sign-or-other-nonverbal languages.
var/list/will_assist_languages = list() var/list/will_assist_languages = list()
@@ -135,7 +136,7 @@ var/list/organ_cache = list()
if(B && prob(40)) if(B && prob(40))
reagents.remove_reagent("blood",0.1) reagents.remove_reagent("blood",0.1)
blood_splatter(src,B,1) blood_splatter(src,B,1)
if(config.organs_decay) damage += rand(1,3) if(config.organs_decay && decays) damage += rand(1,3)
if(damage >= max_damage) if(damage >= max_damage)
damage = max_damage damage = max_damage
adjust_germ_level(rand(2,6)) adjust_germ_level(rand(2,6))