Merge pull request #3922 from Crazylemon64/mitocholide_organ_rejuv

Organs can now be made viable again with an application of mitocholide
This commit is contained in:
Fox McCloud
2016-03-20 00:17:13 -04:00
4 changed files with 17 additions and 1 deletions
+3
View File
@@ -389,6 +389,8 @@
organStatus["splinted"] = 1
if(E.status & ORGAN_BLEEDING)
organStatus["bleeding"] = 1
if(E.status & ORGAN_DEAD)
organStatus["dead"] = 1
organData["status"] = organStatus
@@ -415,6 +417,7 @@
organData["bruised"] = I.min_broken_damage
organData["broken"] = I.min_bruised_damage
organData["robotic"] = I.robotic
organData["dead"] = (I.status & ORGAN_DEAD)
intOrganData.Add(list(organData))
@@ -87,6 +87,11 @@
..()
return
/datum/reagent/mitocholide/reaction_obj(var/obj/O, var/volume)
if(istype(O, /obj/item/organ))
var/obj/item/organ/Org = O
Org.rejuvenate()
/datum/reagent/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
+7 -1
View File
@@ -57,7 +57,10 @@ var/list/organ_cache = list()
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
if(new_dna)
dna = new_dna.Clone()
blood_DNA = list()
if(blood_DNA)
blood_DNA.Cut()
else
blood_DNA = list()
blood_DNA[dna.unique_enzymes] = dna.b_type
/obj/item/organ/proc/die()
@@ -173,6 +176,9 @@ var/list/organ_cache = list()
/obj/item/organ/proc/rejuvenate()
damage = 0
germ_level = 0
status &= ~ORGAN_DEAD
if(!owner)
processing_objects |= src
/obj/item/organ/proc/is_damaged()
return damage > 0
+2
View File
@@ -174,6 +174,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
</span>
{{if value.status.splinted}} splinted <br> {{/if}}
{{if value.status.robotic}} robotic <br> {{/if}}
{{if value.status.dead}} <span class='bad'>DEAD</span> <br {{/if}}
{{if value.shrapnel_len}}
{{for value.shrapnel : shrapValue:shrapindex}}
{{:shrapValue.known ? shrapValue.name : "unknown object"}} <br>
@@ -220,6 +221,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
</span>
{{if value.robotic == 1}} robotic <br> {{/if}}
{{if value.robotic == 2}} assisted <br> {{/if}}
{{if value.dead}} <span class='bad'>DEAD</span> <br> {{/if}}
</td>
</tr>
{{/for}}