Merge branch 'master' into wounds-part-2

code/modules/zombie/items.dm

@@ -37,11 +37,11 @@
 	if(!proximity_flag)
 		return
 	else
-		if(istype(target, /obj/)) //do far more damage to non mobs so we can get through airlocks
+		if(istype(target, /obj)) //do far more damage to non mobs so we can get through airlocks
 			var/obj/target_object = target
 			target_object.take_damage(force * 3, BRUTE, "melee", 0)
-		else
-			if(isliving(target) && ishuman(target))
+		else if(isliving(target))
+			if(ishuman(target))
 				try_to_zombie_infect(target)
 			else
 				check_feast(target, user)

code/modules/zombie/organs.dm

@@ -93,7 +93,8 @@
 	playsound(owner.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
 	owner.do_jitter_animation(living_transformation_time)
 	owner.Stun(living_transformation_time)
-	to_chat(owner, "<span class='alertalien'>You are now a zombie!</span>")
+	to_chat(owner, "<span class='alertalien'>You are now a zombie! You claw and bite, turning your fellow crewmembers into friends that help spread the plague.</span>")
+	to_chat(owner, "<span class='alertwarning'>You are a zombie. Please act like one. Letting the crew remove the tumor inside your brain is a dick move to whoever infected you. Please do not do it.</span>")
 
 /obj/item/organ/zombie_infection/nodamage
 	causes_damage = FALSE