From 7c26e03d52be5390aef7ffac99205dc8d4e1f2ac Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 16 Dec 2017 11:23:37 -0500 Subject: [PATCH 1/2] Reenable organ rejection but make it work correctly Based on the name of the species, rather than datum, so printed/former bodies of the same species used as donors (or anyone with the same species name, really, if you want to do certain things, like "Chakat" organs would be compatible with each other). --- code/modules/organs/organ.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index d6d1b72591..1a283980b9 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -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. From c226fa26273534265ec9beba3fa10416d1a06799 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 16 Dec 2017 11:28:18 -0500 Subject: [PATCH 2/2] Fix compile warning Cyantime removed the uses of this var but didn't remove the definition, so this removes that too, to prevent that compiletime warning. --- code/modules/mob/living/silicon/say.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 886f36a740..9cf8b7c7c6 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -73,7 +73,6 @@ var/obj/machinery/hologram/holopad/T = src.holo if(T && T.masters[src])//If there is a hologram and its master is the user. - var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages //Human-like, sorta, heard by those who understand humans. var/rendered_a //Speech distorted, heard by those who do not understand AIs.