Update megafauna.dm

2017-12-30 13:33:45 -06:00
parent 2994b4b7c2
commit 32291c247b
1 changed files with 0 additions and 4 deletions
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -105,11 +105,7 @@
 	visible_message(
 		"<span class='danger'>[src] devours [L]!</span>",
 		"<span class='userdanger'>You feast on [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)
 		adjustBruteLoss(-L.maxHealth/2)
 	L.gib()