um who tf: part 2

This commit is contained in:
Zach 2015-05-12 00:12:08 -05:00
parent 81e54370ed
commit eacdc7f4d3

View file

@ -23,16 +23,7 @@ class DistributedNPCLaffRestock(DistributedNPCToonBase):
self.laffGui = None
self.av = None
DistributedNPCToonBase.disable(self)
<<<<<<< HEAD
=======
def destroyDialog(self):
if hasattr(self, 'dialog'):
self.dialog.cleanup()
del self.dialog
>>>>>>> 36e553a9416c719237c2360890f114f311c821d8
def initToonState(self):
self.setAnimState('neutral', 0.9, None, None)
if self.name in NPCToons.LaffRestockPositions: