cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 11:32:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CHIRRET_SPECIES

Browse Source
This commit is contained in:
Cameron653
2017-12-18 19:48:38 -05:00
committed by GitHub
parent aa3122b08d 37aa4dbe43
commit b7d0c61cee
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
+2 -2
View File
@@ -129,7 +129,7 @@ var/list/organ_cache = list()
else if(owner && owner.bodytemperature >= 170) //cryo stops germs from moving and doing their bad stuffs
//** Handle antibiotics and curing infections
handle_antibiotics()
//handle_rejection() //VOREStation Edit. Was causing major issues.
handle_rejection()
handle_germ_effects()
//check if we've hit max_damage
@@ -189,7 +189,7 @@ var/list/organ_cache = list()
// immunosuppressant that changes transplant data to make it match.
if(dna)
if(!rejecting)
if(blood_incompatible(dna.b_type, owner.dna.b_type, species, owner.species))
if(blood_incompatible(dna.b_type, owner.dna.b_type, species.name, owner.species.name)) //VOREStation Edit - Process species by name.
rejecting = 1
else
rejecting++ //Rejection severity increases over time.