Merge pull request #1713 from Markolie/master

Fixes

code/modules/mob/living/carbon/human/human.dm

@@ -431,7 +431,9 @@
 			var/armor_block = run_armor_check(affecting, "melee")
 			apply_damage(damage, BRUTE, affecting, armor_block)
 
-/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)
+/mob/living/carbon/human/proc/is_loyalty_implanted(mob/living/carbon/human/M)	
+	if(!istype(M))
+		return 0
 	for(var/L in M.contents)
 		if(istype(L, /obj/item/weapon/implant/loyalty))
 			for(var/obj/item/organ/external/O in M.organs)

code/modules/mob/living/carbon/human/species/station.dm

@@ -452,6 +452,9 @@
 	blood_color = "#1F181F"
 	flesh_color = "#AAAAAA"
 	reagent_tag = PROCESS_SYN
+	
+	has_organ = list(
+		)
 
 /datum/species/machine/handle_death(var/mob/living/carbon/human/H)
 	H.emote("deathgasp")

code/modules/mob/living/carbon/human/update_icons.dm

@@ -213,6 +213,7 @@ var/global/list/damage_icon_parts = list()
 			if(O.damage_state == "00") continue
 			var/icon/DI
 			var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]"
+
 			if(damage_icon_parts[cache_index] == null)
 				DI = new /icon(species.damage_overlays, O.damage_state)			// the damage icon for whole human
 				DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY)	// mask with this organ's pixels

code/modules/mob/living/simple_animal/revenant/revenant.dm

@@ -216,7 +216,7 @@
 	..()
 
 /datum/objective/revenant/check_completion()
-	if(!istype(owner.current, /mob/living/simple_animal/revenant) || !owner.current)
+	if(!owner || !istype(owner.current, /mob/living/simple_animal/revenant))
 		return 0
 	var/mob/living/simple_animal/revenant/R = owner.current
 	if(!R || R.stat == DEAD)