Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)

code/modules/zombie/items.dm

@@ -39,7 +39,7 @@
 	else
 		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)
+			target_object.take_damage(force * 3, BRUTE, MELEE, 0)
 		else if(isliving(target))
 			if(ishuman(target))
 				try_to_zombie_infect(target)