Update mob.dm

2018-01-27 14:16:47 -06:00
parent 6d9e8110f5
commit 396245d85f
1 changed files with 0 additions and 3 deletions
@@ -33,11 +33,8 @@
 			continue
 		var/datum/atom_hud/alternate_appearance/AA = v
 		AA.onNewMob(src)
-<<<<<<< HEAD
 	hook_vr("mob_new",list(src))
-=======
 	nutrition = rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX)
->>>>>>> 6f65453... Mobs start with a random nutrition amount (#34791)
 	. = ..()

 /mob/GenerateTag()