From 2994b4b7c251425e437ac0ff73863cd72958b766 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 30 Dec 2017 13:33:37 -0600
Subject: [PATCH] Update blood_drunk_miner.dm

---
 .../simple_animal/hostile/megafauna/blood_drunk_miner.dm      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index ccdcbbf8ef..d7ec60466e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -114,11 +114,7 @@ Difficulty: Medium
 		if(L.stat == DEAD)
 			visible_message("<span class='danger'>[src] butchers [L]!</span>",
 			"<span class='userdanger'>You butcher [L], restoring your health!</span>")
-<<<<<<< HEAD
-			if(!(z in GLOB.station_z_levels && !client)) //NPC monsters won't heal while on station
-=======
 			if(!is_station_level(z) || client) //NPC monsters won't heal while on station
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 				if(guidance)
 					adjustHealth(-L.maxHealth)
 				else