Merge branch 'master' into CHIRRET_SPECIES

code/modules/mob/living/silicon/say.dm

@@ -73,8 +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
-		if(!hologram) return //VOREStation edit. I keep getting compile warnings because of this!
 		//Human-like, sorta, heard by those who understand humans.
 		var/rendered_a
 		//Speech distorted, heard by those who do not understand AIs.

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.